added acceptance test for editing concept-type character attributes
using an html select
integrating main into feature-attr-select

Conflicts:
	teledusite/teledu/tests/acceptance/testCharacter.py
char_attr template now produces a data-editor html attribute
char_attr template sets data-editor attribute to select for concept-type
attributes
concept attribute now represented as select inputs on character sheet;
not able to interactively set attr yet
completed editing concept-type attrs on char sheet using select
Merge branch 'django' into characterUpdates
Removed unnecessary trailing semi-colon
refactored tests for 'fix character' admin action
refactored character model
added unique constraint for concept instance (gameSystem, name)
added acceptance test for simple display of list attributes
db schema now supports multiple values for each character attribute
system tolerates multiple values for an attribute by only returning the
first one found
getting value of list attribute from character now returns list of all
attribute values
list attributes display as ul elements on character sheet
added test for getting list attributes with 'attr' calc function
created new common abstract base for attribute definitions
created common abstract base for attribute values
pulled concept & list properties of character attr defn model up to
parent