First approach.
Merge branch 'bower'

Conflicts:
	.gitignore