Merge pull request #47 from dethstar/master

Add icon changes on slide
Separate Settings into Profile and Settings, update Welcome screen
Merge pull request #49 from Proplex/master

Separate Settings into Profile and Settings, update Welcome screen
Merge master branch
+ qrCodeGEneration in profile
+ core.jar to libs
+ QR code in im.tox.qr package