Initial class population for Architecture v1.0
fixes before merging
Merge branch 'master' of https://github.com/adya/YAMP into adya-master

Conflicts:
	YAMPProject/.idea/gradle.xml