removed cross sign from title bar
remove empty blocks
reset property by assigning null
use logical OR instead of bitwise OR
remove extra comma
remove unnecessary semicolon
simplify comparison
add missing semicolon
fix condition
renaming import to match release-0.11 schema
Remove print statement from bottom of settings.py, as it breaks things
Merge pull request #1713 from jamalex/remove_print_in_settings

Remove print statement from bottom of settings.py, as it breaks things
Fix for #1714; lost setting DEFAULT_ENCODING in refactor
Merge branch 'master' into release-0.11.1
Merge pull request #1718 from learningequality/release-0.11.1

i18n merge to master!!! :D
Updating release date and build #
Merge branch 'master' into release-0.11
Updating version and expected release date
Merge branch 'release-0.11' of github.com:learningequality/ka-lite into develop

Conflicts:
	kalite/testing/__init__.py
Updating version and build info