I have no idea what to call this commit.
Merge branch 'master' of github.com:steven989/GIVR into brock-working

Conflicts:
	app/assets/javascripts/ajax.js
	app/controllers/application_controller.rb
Implement Apply and SHortlist buttons on Project popup.
Merge branch 'master' into brock-working

Merge master to brock-working.