commit final doc
commit fix bug
Merge branch 'master' of https://github.com/CE-KMITL-OOAD-2014/Movie_Ticket_booking

Conflicts:
	Alphamovie/src/main/webapp/jsp/myaccount.jsp
	Alphamovie/target/Alphamovie-1.0-SNAPSHOT/jsp/myaccount.jsp
	Alphamovie/target/surefire-reports/ShowtimeListUnitTest.txt
	Alphamovie/target/surefire-reports/TEST-ShowtimeListUnitTest.xml
	Alphamovie/target/surefire-reports/TEST-UserBookingUnitTest.xml
	Alphamovie/target/surefire-reports/UserBookingUnitTest.txt