[release] bumped osiam version to snapshot after released
Merge pull request #17 from tpick/master

Updated smancke's work on deb packaging / working fine with OSIAM 1.3.1
added idea files to gitignore
-support for SNAPSHOT versions
-copy binaries to debian/tmp and build from there
Merge pull request #16 from stweiz/1.4-snapshot

[release] bumped osiam version to snapshot after released
Merge remote-tracking branch 'upstream/master'

Conflicts:
	debian/changelog
	debian/osiam-resource-server.install
	debian/rules