A new version with some bugs fixed.
new version with tabs
Merge branch 'HEAD', remote-tracking branch 'upstream/master'

Conflicts:
	.classpath
	res/values/config.xml