Merge branch 'bug-fixes' of https://github.com/BuildmLearn/BuildmLearn-Toolkit-Android into bug-fixes

Author: opticod

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/InfoAdapter.java

@@ -105,7 +105,7 @@ public void onClick(View v) {
                         .title(R.string.info_add_new_title)
                         .customView(R.layout.info_dialog_add_edit_data, true)
                         .positiveText(R.string.info_template_add)
-                        .negativeText(R.string.info_template_delete)
+                        .negativeText(R.string.info_template_cancel)
                         .build();
 
                 final InfoModel data = getItem(position);

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/LearnSpellingAdapter.java

@@ -105,7 +105,7 @@ public void onClick(View v) {
                         .title(R.string.info_add_new_title)
                         .customView(R.layout.info_dialog_add_edit_data, true)
                         .positiveText(R.string.info_template_add)
-                        .negativeText(R.string.info_template_delete)
+                        .negativeText(R.string.info_template_cancel)
                         .build();
 
                 final LearnSpellingModel data = getItem(position);

source-code/app/src/main/java/org/buildmlearn/toolkit/templates/QuizAdapter.java

@@ -163,7 +163,7 @@ private void editItem(final int position, final Context context) {
                 .title(R.string.quiz_edit)
                 .customView(R.layout.quiz_dialog_add_question, wrapInScrollView)
                 .positiveText(R.string.quiz_add)
-                .negativeText(R.string.quiz_delete)
+                .negativeText(R.string.quiz_cancel)
                 .build();
 
         final EditText question = (EditText) dialog.findViewById(R.id.quiz_question);