Added code, GWT part merged, PHP part still work in progress.
nothing tested.