merging
Merge branch 'master' of https://github.com/ChristianJGarrido/thejuke

Conflicts:
	src/main/java/com/netbuilder/thejuke/DBPopulator.java
	src/main/java/com/netbuilder/thejuke/web/SearchController.java
Merge branch 'master' of https://github.com/ChristianJGarrido/thejuke
Added basic QueueController