push
Merge branch 'master' of github.com:hieutn/voer

Conflicts:
	Voer/src/vn/edu/voer/service/ServiceController.java
Fixed crash when searching