Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/orobator/android/scenerecon/view/customviews/HorizontalOffsetView.java
Merge remote-tracking branch 'origin/master'