fix bug
update
setting
setting
update setting
Merge branch 'DucLe-2014-08-11' of https://github.com/lunextelecom/app-manager.git into DucLe-2014-08-11
update setting
Merge branch 'DucLe-2014-08-11' of
https://github.com/lunextelecom/app-manager.git into DucLe-2014-08-11

Conflicts:
	lunex/appmanagersvc/prod_settings.py