Precompile assets for heroku
Precompile assets for heroku
Merge branch 'master' of heroku.com:befriendly

Conflicts:
	public/assets/application-3f0ee12345e620aaa8eb5b1c043b0d15.js
	public/assets/application-e1df83ba6a0dbbacd5e5072f6dd70c9d.css
	public/assets/large/default_avatar-3f5ef8b1c3e81d9da9109fa3ee039712.png
	public/assets/large/default_avatar.png
Lol commit