Merge origin/current into current

Conflicts:
	build.xml
	nbproject/build-impl.xml
	nbproject/genfiles.properties
	nbproject/project.properties
	nbproject/project.xml
	src/pkg490os_project1/Car.java
	src/pkg490os_project1/CarSpec.java
	src/pkg490os_project1/Container.java
	src/pkg490os_project1/Customer.java
	src/pkg490os_project1/Rental.java
	src/pkg490os_project1/Searchable.java
Merge branch 'current'

Conflicts:
	.gitignore