- bug fixes
Merge branch 'master' of github.com:xlike-project/wp5

Conflicts:
	visualization/js/common.js