Added various functionalities location lookup and category assignment, plus linking with frontend. Also refactor.
Merge branch 'master' of https://github.com/mduppes/campusbuzz

Conflicts:
	site/campusbuzz/app/modules/aggregation/AggregationShellModule.php
	site/campusbuzz/app/modules/buzz/BuzzAPIModule.php
	site/campusbuzz/lib/Categorizer.php
	site/campusbuzz/lib/DataSourceConfig.php
	site/campusbuzz/lib/FeedItem.php
	site/campusbuzz/lib/FeedItemSolrDataRetriever.php
	site/campusbuzz/lib/GeoRadiusSearchFilter.php
	site/campusbuzz/lib/SearchQuery.php
	site/campusbuzz/lib/SolrDataRetriever.php
	site/campusbuzz/lib/TimeSearchFilter.php
	site/campusbuzz/lib/TwitterDataRetriever.php