bower changes
Merge branch 'development'

Conflicts:
	.sass-cache/57d0a3fa2828fcb228f9320c183e3908f869c521/_index.scssc