Simplifying terms
Merge remote-tracking branch 'upstream/master'
update function
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
added list for sublist
Merge remote-tracking branch 'upstream/master'

Conflicts:
	database.pyc

updates
Merge remote-tracking branch 'upstream/master'

Conflicts:
	database.pyc

updates