ignoring eclipse based stuff
Merge branch 'master' into android_dev