#44
:#43
#44
Merge pull request #45 from rhsu/htmlMockupFixup

#44
#43
Merge branch 'htmlMockupFixup'
Merge pull request #46 from rhsu/masterpage

Masterpage
merge conflicts
#47: modified the placeholder of index and master page.
#47
Merge pull request #50 from rhsu/updatingMaster

Updating master
Merge branch 'master' into labels

Conflicts:
	Views/Home/Index.aspx