Removed unnecessary files
Merge remote-tracking branch 'tesobe/master'
add scala sbt configuration instead of maven pom
delete the piwik plugin from the code
solving merge conflicts
Merge branch 'develop'

Conflicts:
	MavLift/.DS_Store
	MavLift/obp_api.iml
have to commit to fix some merging problems
fixing import problems
deleting a googleplus js script wich was useless
Merge branch 'dev'
Merge branch 'master' of github.com:OpenBankProject/OpenBankProject-Server
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	MavLift/src/main/scala/code/model/traits/AccountOwner.scala
	MavLift/src/main/scala/code/model/traits/BankAccount.scala
	MavLift/src/main/scala/code/model/traits/Comment.scala
	MavLift/src/main/scala/code/model/traits/Transaction.scala
fixed some compiling errors
finished to fix the complications errors
Added another Repo as scala-tools.org is offline
fixed some merging conflicts
once again fixing mergin conflicts
fixed mergin conflicts
Merge branch 'dev'