first commit
Merge branch 'master' of github.com:xamry/twitample

Conflicts:
	pom.xml
	src/main/resources/META-INF/persistence.xml