vkontakte oauth login
Merge branch 'master' of https://github.com/martinstrasek/dormitory-web

Conflicts:
	db/schema.rb
forgot to add migration