Merge pull request #4 from jameshume/master

Local changes plus merge conflict fixes and title bar fix to float the search box to the right
merge attempt
Merge branch 'master' of https://github.com/sp0ngey/TripApp

Conflicts:
	app/assets/stylesheets/application.css
	app/views/layouts/application.html.erb
stop user entering someone's trip via url
minor changes to search

more restriction to what user can see if he is not the owner of the trip
Merge branch 'master' of github.com:sp0ngey/TripApp
Adding doP4Diff.bat so I can do a p4diff - used php script to see the params passed to external command. use bat filet o select right parameters to pass to p4merge
Reverting back trip.js so that it is used only for the edit page. We have agreed to have another static-view page that is seperate. Small update to doP4Diff.bat
neatening up the interface a little bit for the trip creation. Added some sanity checking of the dates when the user saves
strted work on firstly tarting up the ui but also making dates switchable to durations
Added some validations to the user model. Trips.js sorted out so that the duration boxes now five visual feedback when not set