SOS-1601

http://issues.liferay.com/browse/SOS-1601, http://issues.liferay.com/browse/SOS-1603, http://issues.liferay.com/browse/SOS-1586, http://issues.liferay.com/browse/SOS-1604, http://issues.liferay.com/browse/SOS-1608