Breaking out ContactType entity
Merge branch 'master' of ssh://github.com/wakeupnow/orchid-clasia

Conflicts:
	src/Wun/Orchid/ApiBundle/Entity/Address.php
	src/Wun/Orchid/ApiBundle/Entity/ContactType.php
	src/Wun/Orchid/ApiBundle/Entity/Email.php
	src/Wun/Orchid/ApiBundle/Entity/Phone.php
Merge remote-tracking branch 'origin/develop' into lord_baine
Type table fixtures. Also fixed typo in Language entity
Adding Rank fixture