22Jan13: need to commit App/.classpath before pull
Merge branch 'master' of https://github.com/sefirot/androidStuff

Conflicts: BerichtsheftApp/.classpath