added dependency on momentjs
Merge branch 'develop'

Conflicts:
	bower.json