changed order of classes
changed note notification to include primary contact
Merge pull request #76 from apatel/master

sort order and adding primary contact to note notification