Fin - 131
Merge branch 'master' of https://github.com/FINEMUGANDA/FINTECH-UI

Conflicts:
	app/index.html
	app/scripts/app.js
	app/views/common/header.html
Merge branch 'master' of https://github.com/FINEMUGANDA/FINTECH-UI
Fin - 131 - Completed
Merge branch 'master' of https://github.com/FINEMUGANDA/FINTECH-UI