Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/course_navigation.html

violation fixes

Remove npm package from Ubuntu installation dependencies file.

Install of edX gives the following error:
-----------------------------------------------
The following packages have unmet dependencies:

nodejs : Conflicts: npm

E: Unable to correct problems, you have held broken packages.
-----------------------------------------------

This is caused by the latest version of nodejs including npm and being
incompatible with the previous version.

Fix is to remove npm line from apt-packages.txt

Pylint and Pep8 fixes for InputTypes

Add the ability to add trailing text to textlines

Add tests for unicode and escaped HTML characters

fix pylint errors in test_login.py

Fix/cdodge/studio forum improvements

Fix pylint errors

get_items has an query ambiguity with respect to revision=None. None has a special semantic in get_items as a wildcard, so if we query with 'None' then we'll get back both draft and non-draft items.

Convert login tests to use factories