superuser added
user controllers changes discarded
tests passing for company related changes