New dev iteration (0.4.6-dev)
bring over some common code fron am & dashboard, EDUID-155