Added the base server side and add support to grunt for outputting a war file which will be used later.
Merge origin/master