Branch doc update
Merge branch 'master' into mongoose_demo

Conflicts:
	.gitignore
Cleaning JS/CSS, adding bower, removing cached.