Merge branch 'master' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
Merge branch 'MasterBugFixing' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
Merge branch 'MasterBugFixing' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
Merge branch 'MasterBugFixing' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
Merge branch 'MasterBugFixing' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
[WEB RELEASE] Create release 6.4.0
[WEB RELEASE] Prepare next development version 6.4.0-SNAPSHOT
Merge branch '6.4.x' into 'master'
[WEB RELEASE] Prepare next development version 7.0.0-SNAPSHOT
Merge branch 'master' into 'MasterBugFixing'
Merge branch 'MasterBugFixing' of github.com:bonitasoft/bonita-portal-js into MasterBugFixing
fix protractor tests
[WEB RELEASE] Prepare next development version 6.5.0-SNAPSHOT
Merge branch 'master' into 'MasterBugFixing'
update and fix angular version dependencies
update and fix angular version dependencies to 1.3.0
Merge branch 'master' into 'MasterBugFixing'
update and fix angular version dependencies to 1.3.0

Conflicts:
	bower.json
fix search filter

(cherry picked from commit 794bded8a5fc4099f8ed38e2671d429e58303991)
fix search filter

(cherry picked from commit 794bded8a5fc4099f8ed38e2671d429e58303991)