Fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	LessSugar/src/com/pewpew/lesssugar/db/DatabaseHandler.java