added Procfile and inital email support
Merge branch 'master' into feat/email

Conflicts:
	app.rb
User activation mail

added activated column to user table
and /user/activate route to be inserted in activation email send to user
Activate changed to get from post
fixed as per review comments
added random key for activation
minor fixes
fixed spec.json
changed default spec.json location
Merge branch 'master' into feature/routes

Conflicts:
	app.rb
	db/schema.rb
resolved schema conflict