Add keywords handling
Merge branch 'master' of https://github.com/ucbl/DataConfMashup

Conflicts:
	index.html
	js/application/model/SWDFCommandStore.js

Cleaning of command store
Keyword rendering and logo issu correcting