An attempt at a contacts directive.  Fixed the overiding form name problem
Merge branch 'dev' into contacts-directive
Friend display tests completed
Friend display tests completed - form still incomplete
Suspend failing test