2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/build/generated/source/r/debug/com/example/android/mtesapp/R.java
2