SAMPLE CONFLICT
Merge branch '1.14.0/develop' of https://github.com/jayarbautista/smaple into 1.14.0/REDMINE/467

Conflicts:
	res/layout/activity_main.xml