moved to ui-router
Merge branch 'master' of https://github.com/algosystech/collosys

Conflicts:
	UserInterface/Settlement/SettlementInterview/SettlementInterview.js
	UserInterface/Settlement/paymentEntry/paymententry.js