all javadoc completed
Merge branch 'master' of https://github.com/it4energy/smartcampusapi

Conflicts:
	src/eu/smartcampus/api/RemoteAPI.java