updated sign in path to /admin/dashboard
updated pages controller to show the about page
Merge branch 'develop' into static-pages

Conflicts:
	app/controllers/pages_controller.rb
	app/views/shared/splash/_splash_mainnav.html.erb
	config/routes.rb
	public/assets/application-4eec4beb1369afc74f30e6a772edf325.js.gz
	public/assets/application.css
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/manifest.yml
Fixing issues with compiling.