changes to repo
model
Merge branch 'master' of https://github.com/sprabina/AffinityMapperServer

Conflicts:
	war/WEB-INF/appengine-generated/datastore-indexes-auto.xml

war/WEB-INF/classes/com/msse/teamflyte/affinitymapper/AffinityMapperCont
roller.class