rules design updated
Merge branch 'master' of https://github.com/blaz1/BetAFriend
Raw login/registration logic added
Merge branch 'master' of https://github.com/blaz1/BetAFriend

Conflicts:
	app/js/controllers.js
	app/js/services.js
Merge remote-tracking branch 'origin/master'
....