old icons replaced with official ones, NO BACKWARD COMPATIBILITY!
Merge branch 'develop'

Conflicts:
	bower.json
Merge remote-tracking branch 'origin/master'

Conflicts:
	bower.json
	package.json