Merge remote-tracking branch 'origin/local_store' into local_store

Conflicts:
	docroot/css/main.css
Merge branch 'local_store' of
https://github.com/CardioVascular-Research-Group/visualize-portlet.git
into local_store