added id to content, added models/Role, small fixes
Merge branch 'master' of github.com:fkn/domic3

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 4 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	new file:   models/Course.js
#	new file:   models/Material.js
#	new file:   models/TestAnswerManyChoice.js
#	new file:   models/TestAnswerOneChoice.js
#	new file:   models/TestAnswerOpen.js
#	new file:   models/TestGroup.js
#	new file:   models/TestQuestion.js
#
Changed title of page
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is up-to-date with 'origin/master'.
#
# Changes to be committed:
#	modified:   views/layout.jade
#
Text Material Tools Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	routes/materials.js