Updated icons
Build commit
Deploy Commit
Merge branch '1384865480'

* 1384865480:
  Deploy Commit
  Build commit
  Updated icons

Conflicts:
	ico/1304d3aa.apple-touch-icon-144x144.png
	ico/402400ff.apple-touch-icon-72x72.png
	ico/69c47884.apple-touch-icon-57x57.png
	ico/69c47884.apple-touch-icon.png
	ico/6ccff1b0.favicon.ico
	ico/de8349bb.apple-touch-icon-114x114.png
	js/b757accd.main.js