Merge pull request #31 from gMajr/dev

Dev
Merge pull request #33 from gMajr/dev

Dev
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
Merge branch 'dev' of https://github.com/gMajr/gMajorMobile into dev
updated package.json, express should be 4.x
Merge pull request #54 from wlabranche/bugfix/express-version

Bugfix/express version