Precompile assets
Precompile assets
Precompile assets
Merge branch 'master' of heroku.com:getcanteen

Conflicts:
	public/assets/application-0fc7fee75673be172b6ede67924b6a16.js.gz
	public/assets/application-ed7fc2a82139b81cfda8916574ae6c5c.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
Take out CanCan rescue
Remove CanCan authorization on feed page
Change column type from string to integer to prevent PostGreSQL from blowing up
Remove conditional code to custom feed image and only use a placeholder
Delete public assets