Putting back things on track with the Framework
Merge branch 'dev' of https://github.com/snwfog/peerpen into dev