Add service and serviceType model
Merge branch 'master' of github.com:jie-zhang/gomelon into jie
Merge branch 'master' of github.com:jie-zhang/gomelon into jie
Merge pull request #5 from zhenglu316/master

Service and ServiceType
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.
Change User Models
Merge with User
Update .gitignore for ignore .imp

the .imp files are created by IntelliJ IDEA
Update some views for calling the method of login
add reservation pages
merge with ping-dou's source. cost some time to finish the merge.
Add store models