Allow explicit msg id to be passed to show_message.
Include fixed block of 5 questions after completing streak of 8/10.
Don't display empty messages in show_message.
add assert to make sure we have Nalanda package activated
Merge branch '2167' of https://github.com/aronasorman/ka-lite into fixed_exercise_block
Merge branch '2167' of https://github.com/aronasorman/ka-lite into fixed_exercise_block

Conflicts:
	kalite/distributed/views.py
JS template for A/B testing, and make FIXED_BLOCK_EXERCISES changeable.
Merge branch 'nalanda-rct2' of github.com:learningequality/ka-lite into fixed_exercise_block
Merge pull request #2201 from jamalex/fixed_exercise_block

Include fixed block of 5 questions after completing streak of 8/10 (addressing #2168)
add setup_fake_device to make query tests run faster
don't check for nalanda package if we're running on travis
update playlists.json
Merge pull request #2203 from aronasorman/fix_tests

Fix tests
Fix to extra SyncSession deletion.
Merge branch 'release-0.12.0' into nalanda-rct2
Merge branch 'nalanda-rct2' of github.com:learningequality/ka-lite into nalanda-rct2
Fix to get_models to include soft-deleted models and devices.
Allow text overflow for exam headers
Merge branch 'monthly_reports' into nalanda-rct2
whitelist the _generated/ url namespace when taking tests