.
Merge branch 'master' of https://github.com/SofiCloud/Sofi.Web

Conflicts:
	src/web/Sofi.Web/Scripts/app/MenuModule/Transaction.js
	src/web/Sofi.Web/Scripts/app/Shared/App.js