Merge remote-tracking branch 'origin/master'

Conflicts:
	android-git2/.classpath
20140109-1
20140128 commit4
121212