Merge branch 'develop' into simple_stuff
Merge remote branch 'origin/simple_stuff' into simple_stuff
authorized to current, and move to_html to initializers (String extension)
Some new tests, a comment test on the controller: ATP
Merge repo changes we didn't have yet (a merge or two?)
Controller.current_account_id
merge simple_stuff
merge simple_stuff again (should be done)