In progress
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	src/com/animeandmangalabs/quiz_engine/FeedReaderContract.java
Temp database int