Initial commit with new play! version (type safe activator platform) and update from Bootstrap 2 to 3
Merge branch 'master' of https://github.com/hopped/new-zealand-hikes

Conflicts:
	app/controllers/Application.scala
	app/views/index.scala.html
	conf/application.conf
	conf/routes
	project/build.properties
	project/plugins.sbt
	test/ApplicationSpec.scala
	test/IntegrationSpec.scala