Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into production

Conflicts:
	config/db_config.js
Fix to old db_config.
Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into production
Beginning re-CSS.
Styled launch/login page.
Basic nav styling.
Using ng for iOSy view buttons.
Attempted to set 'active' status for navs.
ng-active state now persists on navs.
Correct overlap of nav and position of content below it.
Basic styling for 'new outing' button & form.
General tidying of CSS order & comments.
Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into big-merge

Conflicts:
	app/index.html
	app/scripts/app.js
	app/scripts/controllers/dashboard.js
	app/styles/main.css
	app/views/dashboard.html
	app/views/friends.html
	app/views/movies.html
	app/views/outings.html
Correction to div-wrap & jQ.
Delete unused styles.
Merge branch 'production' of https://github.com/MovieBuddy/moviebuddy into design-update-2

Conflicts:
	app/views/dashboard.html
	app/views/movies.html
	app/views/outings.html
Merge pull request #10 from janaspage/design-update-2

Design update 2