Gulp

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Moved toggle menu outside of main menu

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>
Merge remote-tracking branch 'origin/2.1'

Signed-off-by: Bryan Hoffman <bryan@spigotdesign.com>

Conflicts:
	.gitignore