Skylar Ittner 6ad9d1c716 Merge BusinessAppTemplate ...

# Conflicts:
#	api.php
#	composer.lock
#	lang/en_us.php
#	lib/login.php
#	mobile/index.php

2018-09-07 19:19:07 -06:00

..

index.php

Merge BusinessAppTemplate

2018-09-07 19:19:07 -06:00