completely client and partially front end
Merge pull request #1 from hhy/dev

Merging with master.
Merge pull request #2 from hhy/master

Merging from master