new trail view
Merge branch 'master' of https://github.com/rclosner/trails-mobile into mockup

Conflicts:
	platforms/ios/Trails.xcodeproj/project.pbxproj