Frontend and Backend joined
Merge pull request #4 from bim9262/master

Merge pull request #1 from PervasiveComputing/master
Merge pull request #2 from PervasiveComputing/master

pull two