updates to gulpfile, index, css and js
Merge branch 'master' of https://github.com/ChildAbusePreventionKit/CAP

Conflicts:
	public/index.html
ignore dist