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

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

Conflicts:
	assets/styles/bootstrap/bootstrap.css
	assets/styles/nascop.css
Updated Logo
Returned ADT Color
Merge branch 'master' of https://github.com/RufusMbugua/platform_rb
Js
backup