Allowing /component/<template_id> to work as a route
Merge branch 'master' into find_queue_id

Conflicts:
	lib/alephant/preview/server.rb
modified code to allow for new BASE_LOCATION constant
Merge pull request #1 from Guntrisoft/find_queue_id

Allowing /component/<template_id> to work as a route