Eugene Simakin Merge remote-tracking branch 'origin/master'
d6c1975 Dec 20, 2014
Merge remote-tracking branch 'origin/master'
Conflicts:
	bower.json
d6c1975