upark
Merge remote-tracking branch 'origin/master'

Conflicts:

	upark_141119/src/main/java/bu/edu/upark/controllers/SearchController.java