added geocache app
blank working project
added some style elements (css)
test
first test
test2
"Grundgeruest"
nothing 2
Did nothing
mac store
margin-bottom button
did nothing twice
Merge branch 'master' of https://github.com/cndymn/MyGlossary

Conflicts:
	.DS_Store
	.classpath
	.project
	AndroidManifest.xml
	assets/.DS_Store
	assets/www/.DS_Store
	assets/www/index.html
	bin/AndroidManifest.xml
	bin/jarlist.cache
	bin/res/drawable-hdpi/ic_launcher.png
	bin/res/drawable-mdpi/ic_launcher.png
	bin/res/drawable-xhdpi/ic_launcher.png
	ic_launcher-web.png
	libs/android-support-v4.jar
	libs/cordova-2.6.0.jar
	proguard-project.txt
	project.properties
	res/drawable-hdpi/ic_launcher.png
	res/drawable-mdpi/ic_launcher.png
	res/drawable-xhdpi/ic_launcher.png
	res/layout/activity_main.xml
	res/values-v11/styles.xml
	res/values-v14/styles.xml
	res/values/strings.xml
	res/values/styles.xml
	res/xml/config.xml