lilfade/UserFrosting — pull request #19 by lilfade (2014-08-19 14:56:03+00:00)
Title: updates / changes

from master to dev