Merge remote-tracking branch 'origin/master'

Conflicts:
	been-api/src/main/java/cz/cuni/mff/d3s/been/api/BeenApiImpl.java

fixes #131
Merge remote-tracking branch 'origin/master'

Conflicts:
	been-api/src/main/java/cz/cuni/mff/d3s/been/api/BeenApiImpl.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	been-api/src/main/java/cz/cuni/mff/d3s/been/api/BeenApiImpl.java

fixes #131