把之前在另外一个版本上做的东西移植到该版本下，正在重构blog那一块。（先备份目前的东西）
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
merge with ping-dou's source. cost some time to finish the merge.
sorry for forgetting executing "git rm deletedfiles" before commit and push.
Add blog and comment models
Merge by wzw
the individual salon's info page, with tabs of basic info, style, stylist, coupon, map, blog, comments. go on doing.....
one file missed from last commit.
commit routes