Fix platform dependency
Merge branch 'fix-bad-merge'

Conflicts:
	bower.json