First try of new parsing of messages
Merge fix
Bug fix
Merge branch 'android-devel' of https://github.com/bregell/server into android-devel
Added support for powerstrip naming
Bug fix
Rewritten most code in odbc. Also other functions related to SQL
bug fix
Now diconnects after query
Bug fix in controller
Bug fix
Things now work as they should
Fixed merge conflicts