Server and App updated
Merge branch 'master' of https://github.com/chmbrlnd/ECEN489-Spring2014