By Kevin
Merge branch 'master' of https://github.com/gogole/wallet.git

Conflicts:
	pom.xml
add pom.xml