fix protractor tests
update and fix angular version dependencies to 1.3.0

Conflicts:
	bower.json
fix search filter

(cherry picked from commit 794bded8a5fc4099f8ed38e2671d429e58303991)
Fix conflict