requirements in server
Merge remote-tracking branch 'origin/master'
fixing requirements parth
fixing api keys
changing order of app imports
Merge pull request #334 from qpfiffer/feature/Survey_stats_page

Feature/survey stats page
Merge remote-tracking branch 'upstream/master' into feature/2013_12_17_Fixes