movie rental
http sessions
update all
Merge https://github.com/comscimsuiit/Movierental

Conflicts:
	application.properties
	grails-app/conf/Config.groovy
	grails-app/conf/DataSource.groovy
	grails-app/conf/UrlMappings.groovy
	grails-app/conf/spring/resources.groovy
	grails-app/controllers/movierental/AccountController.groovy
	grails-app/controllers/movierental/ClerkController.groovy
	grails-app/controllers/movierental/MainController.groovy
	grails-app/domain/movierental/Account.groovy
	grails-app/domain/movierental/Cart.groovy
	grails-app/domain/movierental/Customer.groovy
	grails-app/domain/movierental/Movie.groovy
	grails-app/domain/movierental/RentedMovie.groovy
	grails-app/domain/movierental/Request.groovy
	grails-app/domain/movierental/Transaction.groovy
	grails-app/views/clerk/addCustomer.gsp
	grails-app/views/clerk/checkCustomer.gsp
	grails-app/views/clerk/clerkMainPage.gsp
	grails-app/views/clerk/saveTransaction.gsp
	grails-app/views/clerk/searchCustomer.gsp
	grails-app/views/clerk/selectMovie.gsp
	grails-app/views/clerk/viewCustomer.gsp
	grails-app/views/clerk/viewCustomerRecord.gsp
	grails-app/views/layouts/main.gsp
	grails-app/views/main/addClerk.gsp
	grails-app/views/main/addCustomer.gsp
	grails-app/views/main/adminMainPage.gsp
	grails-app/views/main/editInventory.gsp
	grails-app/views/main/manageInventory.gsp
	grails-app/views/main/showTransactions.gsp
	src/groovy/Classes/CustomerDao.groovy
	src/groovy/Classes/RequestDao.groovy
	target/classes/ApplicationResources.class
	target/classes/BootStrap.class
	target/classes/BuildConfig.class
	target/classes/Classes/CustomerDao.class
	target/classes/Classes/IdGenerator.class
	target/classes/Classes/RequestDao.class
	target/classes/Config.class
	target/classes/DataSource$_run_closure1.class
	target/classes/DataSource.class
	target/classes/UrlMappings$__clinit__closure1.class
	target/classes/UrlMappings$__clinit__closure1_closure2.class
	target/classes/UrlMappings.class
	target/classes/application.properties
	target/classes/movierental/Account$__clinit__closure1.class
	target/classes/movierental/Account.class
	target/classes/movierental/AccountController.class
	target/classes/movierental/Cart.class
	target/classes/movierental/ClerkController$_clearLiability_closure2.class
	target/classes/movierental/ClerkController$_clearLiability_closure3.class
	target/classes/movierental/ClerkController$_saveTransaction_closure1.class
	target/classes/movierental/ClerkController$_saveTransaction_closure2.class
	target/classes/movierental/ClerkController.class
	target/classes/movierental/Customer.class
	target/classes/movierental/MainController$_requestAction_closure1.class
	target/classes/movierental/MainController.class
	target/classes/movierental/Movie.class
	target/classes/movierental/RentedMovie.class
	target/classes/movierental/Request.class
	target/classes/movierental/Transaction$__clinit__closure1.class
	target/classes/movierental/Transaction.class
	target/classes/resources$_run_closure1.class
	target/classes/resources.class
	target/eclipseclasses/Classes/CustomerDao.groovy
	target/eclipseclasses/Classes/RequestDao.groovy
	target/eclipseclasses/Config.groovy
	target/eclipseclasses/DataSource.groovy
	target/eclipseclasses/UrlMappings.groovy
	target/eclipseclasses/movierental/Account.groovy
	target/eclipseclasses/movierental/AccountController.groovy
	target/eclipseclasses/movierental/Cart.groovy
	target/eclipseclasses/movierental/CartTests.groovy
	target/eclipseclasses/movierental/ClerkController.groovy
	target/eclipseclasses/movierental/ClerkControllerTests.groovy
	target/eclipseclasses/movierental/Customer.groovy
	target/eclipseclasses/movierental/MainController.groovy
	target/eclipseclasses/movierental/Movie.groovy
	target/eclipseclasses/movierental/MovieTests.groovy
	target/eclipseclasses/movierental/RentedMovie.groovy
	target/eclipseclasses/movierental/RentedMovieControllerTests.groovy
	target/eclipseclasses/movierental/Request.groovy
	target/eclipseclasses/movierental/Transaction.groovy
	target/eclipseclasses/spring/resources.groovy
	target/stacktrace.log
	target/test-classes/integration/application.properties
	target/test-classes/spring/resources.groovy
	target/test-classes/unit/movierental/AccountControllerTests.class
	target/test-classes/unit/movierental/AccountTests.class
	target/test-classes/unit/movierental/CartTests.class
	target/test-classes/unit/movierental/ClerkControllerTests.class
	target/test-classes/unit/movierental/CustomerTests.class
	target/test-classes/unit/movierental/MainControllerTests.class
	target/test-classes/unit/movierental/MovieTests.class
	target/test-classes/unit/movierental/RentedMovieControllerTests.class
	target/test-classes/unit/movierental/RentedMovieTests.class
	target/test-classes/unit/movierental/RequestTests.class
	target/test-classes/unit/movierental/TransactionTests.class
	target/test-reports/TEST-unit-unit-movierental.AccountControllerTests.xml
	target/test-reports/TEST-unit-unit-movierental.AccountTests.xml
	target/test-reports/TEST-unit-unit-movierental.CartTests.xml
	target/test-reports/TEST-unit-unit-movierental.ClerkControllerTests.xml
	target/test-reports/TEST-unit-unit-movierental.CustomerTests.xml
	target/test-reports/TEST-unit-unit-movierental.MainControllerTests.xml
	target/test-reports/TEST-unit-unit-movierental.MovieTests.xml
	target/test-reports/TEST-unit-unit-movierental.RentedMovieControllerTests.xml
	target/test-reports/TEST-unit-unit-movierental.RentedMovieTests.xml
	target/test-reports/TEST-unit-unit-movierental.RequestTests.xml
	target/test-reports/TEST-unit-unit-movierental.TransactionTests.xml
	target/test-reports/TESTS-TestSuites.xml
	target/test-reports/html/all.html
	target/test-reports/html/failed.html
	target/test-reports/html/index.html
	target/test-reports/html/movierental/0_AccountControllerTests.html
	target/test-reports/html/movierental/10_TransactionTests.html
	target/test-reports/html/movierental/1_AccountTests.html
	target/test-reports/html/movierental/2_CartTests.html
	target/test-reports/html/movierental/3_ClerkControllerTests.html
	target/test-reports/html/movierental/4_CustomerTests.html
	target/test-reports/html/movierental/5_MainControllerTests.html
	target/test-reports/html/movierental/6_MovieTests.html
	target/test-reports/html/movierental/7_RentedMovieControllerTests.html
	target/test-reports/html/movierental/8_RentedMovieTests.html
	target/test-reports/html/movierental/9_RequestTests.html
	target/test-reports/plain/TEST-unit-unit-movierental.AccountControllerTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.AccountTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.CartTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.ClerkControllerTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.CustomerTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.MainControllerTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.MovieTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.RentedMovieControllerTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.RentedMovieTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.RequestTests.txt
	target/test-reports/plain/TEST-unit-unit-movierental.TransactionTests.txt
	test/unit/movierental/CartTests.groovy
	test/unit/movierental/ClerkControllerTests.groovy
	test/unit/movierental/MovieTests.groovy
	test/unit/movierental/RentedMovieControllerTests.groovy
	web-app/css/main.css
merged