Merge branch 'PrinceDev'
Merge branch 'PrinceDev'
added class diagram for lfm
Merge branch 'master' into PrinceDev