adding pages
Merge branch 'master' of ssh://github.com/wakeupnow/orchid-clasia

Conflicts:
	app/config/routing.yml
	web/config.php
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 'wup_orig/master'
Merge branch 'master' of https://github.com/zjoia/orchid-clasia