animation loading
animation/hide loader
Merge branch 'master' into gh-pages

Conflicts:
	css/bootstrap.min.css
	index.html
update