Fix bug #5 & Repare String with \ before '
Fix bug #5
Fix bug #5 & Repare String with \ before '
Fix bug #5
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyGoals/src/main/res/values-fr/strings.xml
Bug fix #27 .
Merge pull request #18 from taymiri/master

Fix bug #27