Merge remote-tracking branch 'origin/master'

Conflicts:
	Alphamovie/src/main/java/controller/PageController.java
Merge remote-tracking branch 'origin/master'