TV FILTER: change submatch check

* Check sub-matches with subtree's return value instead of subtree's css
classes
* match's subtree may be viewed
Merge remote-tracking branch 'origin/master'

* origin/master:
fix function call in PMGGame simulation script
Add legend to state machine editor
Lobby- Fix filter
new line sucks
new line sucks
Automated Reservation first version
Add JsonView annotations in Occupation, Actitvity and Assignment to
prevent IDs being exported
remove useless and unused TaskDescriptor from Occupation
Fix search with uppercase
Fix edit.html

Conflicts:

	wegas-app/src/main/webapp/wegas-editor/js/widget/wegas-editor-variabletreeview.js

Merge
Merge branch 'master' of github.com:Heigvd/Wegas

* 'master' of github.com:Heigvd/Wegas:
  fix function call in PMGGame simulation script
  Add legend to state machine editor
  Lobby- Fix filter
  new line sucks
  new line sucks
  Automated Reservation first version
  Add JsonView annotations in Occupation, Actitvity and Assignment to prevent IDs being exported
  remove useless and unused TaskDescriptor from Occupation
  Fix search with uppercase
  Fix edit.html

Conflicts:
	wegas-app/src/main/webapp/wegas-editor/js/widget/wegas-editor-variabletreeview.js