Merge branch 'hotfix/2013-11.0.2'
Removed APP_ENDPOINT settings check from dev/prod settings (in __init__ now)
Merge branch 'hotfix/2013-11.0.3' into develop