Some CSS code writing
Merge branch 'master' into CSS

Conflicts:
	application/views/index/index.php
change some code to make it easy for api call