Merge branch 'master' of https://github.com/KevinMarete/platform_rb

Conflicts:
	assets/styles/nascop.css
Returned Font Awesome
Merge branch 'master' of https://github.com/KevinMarete/platform_rb

Conflicts:
	application/modules/login/views/login_v.php
	assets/styles/nascop.css
Added Source Sans Font
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb

Conflicts:
	assets/styles/nascop.cssf
Notifications