new
Merge pull request #6 from jayarbautista/1.14.0/REDMINE/467

new
changes made
Merge pull request #7 from jayarbautista/1.14.0/REDMINE/467

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

Conflicts:
	res/layout/activity_main.xml