upgrade angular to 1.3.5
Merge branch 'master' of https://github.com/lebsral/ERG

Conflicts:
	bower.json