Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into fernando_branch

Conflicts: android/Pictogrammar/.idea/gradle.xml android/Pictogrammar/app/app.iml

Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram into fernando_branch
Conflicts: android/Pictogrammar/.idea/gradle.xml android/Pictogrammar/app/app.iml
741bbc42 · Fernando Martínez Santiago · b6f8b247 · 741bbc42 · 741bbc42 · 741bbc42
Commit 741bbc42 authored Mar 17, 2016 by Fernando Martínez Santiago
Showing with 0 additions and 0 deletions
android/Pictogram/app/app-DefaultFlavor-release.apk
android/Pictogram/app/src/main/res/drawable-hdpi/pictoff.png
android/Pictogram/app/src/main/res/drawable-hdpi/picton.png
--- a/android/Pictogram/app/app-DefaultFlavor-release.apk
+++ b/android/Pictogram/app/app-DefaultFlavor-release.apk
--- a/android/Pictogram/app/src/main/res/drawable-hdpi/pictoff.png
+++ b/android/Pictogram/app/src/main/res/drawable-hdpi/pictoff.png
--- a/android/Pictogram/app/src/main/res/drawable-hdpi/picton.png
+++ b/android/Pictogram/app/src/main/res/drawable-hdpi/picton.png