to conform with heroku standards moved app to base directory
Merge branch 'master' into moving_application_to_parent_dir