Commit changes
Merging of Branches
sync 25/09/14
Merge remote-tracking branch 'origin/master'

Conflicts:
	AtomicInfromationConfigManager2/build/web/Faces/artefactatomicinformation/ScanList.xhtml
	AtomicInfromationConfigManager2/nbproject/private/private.xml