moar cleanup
Merge remote-tracking branch 'upstream/master'
using live dbpedia data
javascript components
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/controllers/main.php
more error handling