Contacts

Sorry for the messy commit, thoroughly tested and even already in production at woava.

Video explaining additions available at: http://www.youtube.com/watch?v=1TzKvB8_pjE

Resolution for issue #5