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

Conflicts:
	app/scripts/controllers/Product/mapAccount.js
Fin - 117 - Filter on dropdown