Update Code
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/reality/framework/data/sqlite/RESQLiteDatabase.java