Small changes to Architecture and ArchGen

- Add nsats to Architecture.compareTo
- Remove duplicates from localSearch
Merge branch 'master' of https://github.com/dselva80/RBES_EOSS

Conflicts:
	java/src/rbsa/eoss/ArchitectureGenerator.java