salon index page. doing......
Merge remote branch 'origin/master'

Conflicts:
	app/controllers/style/Styles.scala
Merge branch 'master' of github.com:jie-zhang/gomelon
add the initial data for Service and ServiceType.