- Prepare for filter bar
Merge branch 'master' of https://github.com/GermanBluefox/DashUI

Conflicts:
	dashui/js/dashuiEdit.js