Hackathons view
Merge branch 'master' of github.com:bilalq/Hacker-League-Mobile

Conflicts:
	app/views/hackathons.xml
Merge branch 'master' of github.com:bilalq/Hacker-League-Mobile

Conflicts:
	app/controllers/index.js