Added config for trajectory
Merge branch 'master' of git://github.com/auv-avalon/auv_bundle

Conflicts:
	models/profiles/main.rb