refactored code, and fixed labeled blog
fixed the merge
Merge branch 'master' of https://github.com/weindex/weindex.ca

Conflicts:
	weindex.web/src/main/webapp/css/weindex-index.css
Merge branch 'master' of https://github.com/weindex/weindex.ca

Conflicts:
	weindex.web/src/main/webapp/css/weindex-index.css