user signup, log in and log out
added scaffolding for trips and POIs
Merge branch 'feature/user-login' into feature/create-models

Conflicts:
	config/routes.rb
	db/schema.rb
added associations
Merge branch 'feature/create-models' into develop
added bootstrap
added therubyracer to Gemfile
applied bootstrap
Merge branch 'develop' of github.com:vincentdyleung/webeng-2013-ex4 into develop

Conflicts:
	Gemfile.lock
create new trips
removed manage_trip folder
show trip participants
manage trip participants
protect trip from edit or delete by other users
add POI to trips
one POI can only belong to one trip
UI tweaks
Merge branch 'feature/manage-trips' into develop
adapt to heroku
Merge branch 'release/0.1'