push to heroku
AppFog uses db as database name
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
work on connecting appfog to mongo
#34 sessions needs to be working to generate the _csrf token
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade

Conflicts:
	app/utils/dbconnect.coffee
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
#35 fix reset password after federated login
Merge branch 'master' of git://github.com/nikopolidi/tzm-blade
#36 fix for Facebook and clear up code
push to heroku
update
redis-url
fix
fixed mailer