Update rabl
Merge branch 'master' of github.com:jaaaaared/battlehack-web
Add wallpaper and profile picture
Add More detailed seeds and remove useless migration
Merge branch 'master' into kaiwei/seed-data

Conflicts:
	app/api/resources/v1/tasks.rb
	app/models/task.rb
	db/schema.rb
Merge pull request #11 from jaaaaared/kaiwei/seed-data

Kaiwei/seed data
Remove test stuff
Merge branch 'master' of github.com:jaaaaared/battlehack-web
Merge branch 'master' into jcao