update
Merge remote-tracking branch 'origin/master'
nav-bar & passwordcheck
Conflicts:
	Alphamovie/src/main/java/controller/PageController.java