BIG update - added Mandrill API to app, now has emailing ability
Merge branch 'develop' of github.com:Xanadhi/time_capsule into develop

Conflicts:
	app/actions.rb
	app/views/layout.erb
	app/views/nav.erb