modiify
Merge branch 'master' of git.oschina.net:yafengli/sbt-application-plugin

Conflicts:
	project/plugins.sbt
Merge branch 'master' of git.oschina.net:yafengli/sbt-application-plugin