Support for Qualified Associations
Merge branch 'master' into Iteration3_QualifiedAssociation

Conflicts:
	acceleo/run_all_tests.sh
	acceleo/src/acceleo/main/generate.mtl
Update comment test code for compatibility with qualified association
template
Merge pull request #42 from uiuc-cs428/Iteration3_QualifiedAssociation

Support for Qualified Associations.
Add unit tests for association and navigability.
Correct unit test path typo.
resolving conflicts