Removed $scope.$parent
Bower packages versions are fixed (should fix #1085)
Merge branch 'wallet-v2' of https://github.com/stellar/stellar-client into wallet-v2

Conflicts:
	app/scripts/controllers/settings-email-controller.js
	app/scripts/controllers/settings-recovery-controller.js