Committing for pull
Merge branch 'master' of https://github.com/amadeus428/trunk

Conflicts:
	Amadeus/src/com/cs429/amadeus/views/StaffView.java
Added tests for StaffView using reflection
Merge branch 'master' of https://github.com/amadeus428/trunk

Conflicts:
	Amadeus/src/com/cs429/amadeus/views/StaffView.java
Added tests for StaffView