Cleaned up warnings and some errors
Merge branch 'master' of
https://github.com/apoclyps/SoC-E-Health-Server.git

Conflicts:
	E-Health
Server/src/uk/co/jackgraham/ehealth/controller/rest/GetFeeds.java
Merge branch 'master' of https://github.com/apoclyps/SoC-E-Health-Server.git
Re-added interface for REST