Merge pull request #4 from Bnei-Baruch/client

Client
Merge pull request #5 from Bnei-Baruch/client

Client
Merge pull request #6 from Bnei-Baruch/client

Client
temp
Merge remote-tracking branch 'origin/client'

Conflicts:
	css/kabtv.css
	js/controllers.js
Merge remote-tracking branch 'origin/client'