added control panel
added new about us page
Merge remote-tracking branch 'origin/tal' into wes