WM:
Merge branch 'master' of https://github.com/onlab2014/onlab2014_repo.git

Conflicts:
	WorkflowManager/src/main/webapp/WEB-INF/templates/wm_frame.xhtml
WM: