just a few synatx fixes
Merge remote-tracking branch 'upstream/master'
disable retrieving annotations per each word of aya 
else there is [ONLY ONE AYA] , fix #152
Merge branch 'master' of github.com:Alfanous-team/alfanous
Splitting up the settings file to private/public parts (issue #99)
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:01walid/alfanous
move many private variables from settings.py to settings.ini.proto
Moving public config info to the settings.ini.proto file and assign fetched values to their ready-to-use variables (issue #99)
Migrating more config info to settings.ini.proto (issue #99)
Merge branch 'master' of github.com:01walid/alfanous

Conflicts:
	src/alfanous-django/settings.py