Merge branch 'master' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
	src/main/java/com/testdroid/api/DefaultAPIClient.java
	src/main/java/com/testdroid/api/Test.java
	src/main/java/com/testdroid/api/model/APIFiles.java
APIFiles.java fixes
Merge branch 'master' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
	src/main/java/com/testdroid/api/DefaultAPIClient.java
	src/main/java/com/testdroid/api/model/APIFiles.java
	src/main/java/com/testdroid/api/model/APIUser.java
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
	src/main/java/com/testdroid/api/Test.java
Merge branch 'master' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/bitbar/testdroid-api into devel
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel

Conflicts:
	pom.xml
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel
Merge pull request #48 from srautiai/master

fixed scm props
[maven-release-plugin] prepare release testdroid-api-1.3.3
[maven-release-plugin] prepare for next development iteration
Merge pull request #49 from bitbar/master

Master to devel
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel
mapping empty collections in xml
Merge pull request #50 from kajdus/devel

mapping empty collections in xml
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel
TC-221: binding notification emails to user and his projects
Merge pull request #51 from kajdus/devel

TC-221: binding notification emails to user and his projects
Merge branch 'devel' of https://github.com/bitbar/testdroid-api into devel