Merge branch 'master' into page

# Conflicts:
#	app/src/main/java/com/runt/open/mvvm/ui/loadpage/PageViewModels.java