Some Registration validation
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev

Conflicts:
	peerpen.iml
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev