Merge pull request #16 from Dermenslof/dev

Dev
Merge pull request #17 from Dermenslof/dev

big upgrade for future apps and gui
Autopush - Fri May 16 13:17:58 CEST 2014