prepare for next development iteration
Merge pull request #104 from avasquez614/2.3.x

Fix for several issues.
prepare for next development iteration
Fix CRAFTERCMS-560
See issue for further instructions
Merge pull request #105 from cortiz/2.3.x

Fix CRAFTERCMS-560
Fix CRAFTERCMS-566
Fix the lock in user when unlike/undislike
Merge pull request #106 from cortiz/2.3.x

Fix CRAFTERCMS-566
CRAFTERCMS-563: disabling commenting for user's without the necessary permissions
Template updates
* likes, dislikes, unlikes, undo dislike
* temporarily remove unsupported UI trash
* adding class to social bar control element li
* Style adjustments and fixes
* Rich text editor content styles
* Component updates
* Base controller adjustments
* Models adjusted
* View adjustments
* Updates to index.html
Fix CRAFTERCMS-577
SOCIAL_AUTHOR cannot attach files to discussion
Merge pull request #109 from cortiz/2.3.x

Fix CRAFTERCMS-577
Fix CRAFTERCMS-560
See issue for further instructions
Fix CRAFTERCMS-566
Fix the lock in user when unlike/undislike
Fix CRAFTERCMS-577
SOCIAL_AUTHOR cannot attach files to discussion
Merge branch 'master' of https://github.com/craftercms/social into 2.3.x

Conflicts:
	admin/pom.xml
	blog/pom.xml
	pom.xml
	server/pom.xml
	ui/pom.xml
	virus-scanner/pom.xml