update
fixed problems

Conflicts:
	bower.json