- Changed methods in services so it retries the request 5 times before telling the application promise is rejected.
Merge origin/master

Conflicts:
	www/js/controllers.js