Merge branch 'master' into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Merge branch 'dev' of https://github.com/3divs/OpenRecess into 3divs-dev

Conflicts:
	public/stylesheets/style.css
Adding heroku specific configs
Merge branch 'master' of heroku.com:openrecess

Conflicts:
	public/stylesheets/style.css