Merge branch 'construction-for-Roy'

Conflicts:
src/com/example/insightdemo/MainActivity.java