rake version
Merge branch 'master' of github.com:Bnei-Baruch/kmedia
Merge branch 'master' of github.com:Bnei-Baruch/kmedia
Merge branch 'master' of github.com:Bnei-Baruch/kmedia
Merge branch 'master' of github.com:Bnei-Baruch/kmedia

Conflicts:
	Gemfile
	Gemfile.lock
Merge branch 'master' of github.com:Bnei-Baruch/kmedia
misc changes for production
Merge branch 'master' of github.com:Bnei-Baruch/kmedia