Fixing inclusion of bower_components
Merge branch 'master' of https://github.com/vixis/angularplasmid

Conflicts:
	.gitignore