Merge pull request #5 from jkamcc/master

Mobile People Directory 1.0.1
Merge pull request #6 from jkamcc/master

LRA-133
Merge pull request #7 from jkamcc/master

solving UI error on win 7 and email display block
adding props keys, skype integration in configuration, adding constants
Merge remote-tracking branch 'upstream/master'
adding Skype on small profile info
minor refactors 
remove autogenerated files
Merge branch 'master' of
https://github.com/rivetlogic/mobile-people-directory
Merge pull request #8 from cjimenez2581/master

removing auto generated files and refactor
adding skype and phone for large view
Merge remote-tracking branch 'upstream/master'

Conflicts:
	portlets/people-directory-portlet/docroot/WEB-INF/src/content/Language.properties
	portlets/people-directory-portlet/docroot/html/configuration.jsp