Add Basic Logging
New Exception Handling
Add Logging
Merge remote-tracking branch 'origin/master' into Exception_Handling

Conflicts:
	app/Global.java
	app/controllers/Trends.java
	app/services/CodeTrendService.java
Initial Json Response
json response switched to view
formatted JSON response
Merge remote-tracking branch 'upstream/master'
changes
line end
Merge pull request #20 from asmaukstelis/json

Json
test timed method
consistent style
organise imports
Merge pull request #21 from ollyjshaw/imports

organise imports
Merge branch 'master' into client_back_end
Merge with Master
code refactor
Add Error Handling Test
Update test to use static class