Final Login
Merge changes with remote
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev