updated to R0.3 again and fixed some stuffs and removed groups to start over again
Merge origin/master