Merge pull request #2 from Fisbang/design

Design Update 28-Oct-2014
dian_branch
Merge pull request #3 from Fisbang/dian_branch

dian_branch
Better structure for web