replaced fmpp with sbt-boilerplate
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	project/Build.scala
	project/plugins.sbt
fixed merge issue
Merge pull request #2 from OlegIlyenko/master

replaced fmpp with sbt-boilerplate