Merge branch 'master' of https://github.com/prabhutech/sporkit_web

Conflicts:
	css/mobile.css