Merge branch 'master' of msdl.uantwerpen.be:claudio/HintCO

# Conflicts:
#	HintConfiguration.edit/src/ua/ansymo/hintco/provider/PrecedenceNodeItemProvider.java