just a few synatx fixes
Merge remote-tracking branch 'upstream/master'
Merge pull request #145 from assem-ch/master

Moving to the full use of django in the WUI and  Many changes on the API
Merge pull request #146 from assem-ch/master

Continue the Django move with many API improvements
(fix #95, fix #139)
Merge pull request #147 from assem-ch/master

Complete the jQuery-to-Django Move with many modifications on the API

fix #114, 
fix #138,
fix #46,
fix #32
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
add a missed point in the test of settings.ini.proto file path