- working on filter
- filter (unfinished)
- merge
- filter (unfinished)
- merge
Merge origin/master

Conflicts:
	www/js/controllers.js
- filter fixed
- css buttons fixed
- filter fixed
- css buttons fixed