Updated nav and main page
Big changes to styling
Merge pull request #1 from limratana/New-UI

New UI implimentation
Merge branch 'set_log'
Merge branch 'master' of https://github.com/limratana/superset

Conflicts:
	client/main.html
rebase from master
Merge branch 'set_log' of https://github.com/limratana/superset into set_log

Conflicts:
	client/main.html