wow much stuff
Merge branch 'master' of https://github.com/flxn/michelangelo-fbs.git

Conflicts:
	src/application/view/TableViewController.java
Merge branch 'master' of https://github.com/flxn/michelangelo-fbs.git