Pre merge master
merge with master
Merge pull request #54 from HexagonStorms/jonathan_users_table

Creator Dashboard Edits, Modal Edits