Merge pull request #1849 from Oldiesmann/release-2.1

Register -> Sign Up (Closes #1728)
Merge pull request #1851 from Oldiesmann/release-2.1

Cleanup and merger of sqlite files
one line of conditions ~ not two

The tab was still messed up after the for loop and there are 2 lines of conditions whereas only 1 line of multiple conditions using "&" is necessary. I also put the key of "code" for the initial empty check only because the next condition depends on it.

Signed-off-by: -Underdog- github.underdog@gmail.com
! Packman was a bit broken (browse sub template)

Signed-off-by: John Rayes <live627@gmail.com>
- Button strip no longer needs that RTL hack

Signed-off-by: John Rayes <live627@gmail.com>
http://www.simplemachines.org/community/index.php?topic=519379.0

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1854 from live627/dev

A few random fixes
Merge pull request #1853 from Underdog-01/patch-20

one line of conditions ~ not two
! Do zebra striping in the admin again

Signed-off-by: John Rayes <live627@gmail.com>
! Make the menu usable again in RTL

Signed-off-by: John Rayes <live627@gmail.com>
!Undefined variable: user_info  Sources/News.php

Signed-off-by: Suki <suki@missallsunday.com>
Gotta make sure a variable exists before incrementing its value
#1855

Signed-off-by: Suki <suki@missallsunday.com>
! Message index fix for RTL

Signed-off-by: John Rayes <live627@gmail.com>
Merge pull request #1856 from live627/dev

More random fixes
Implement an Image Proxy

This is required in order to properly serve non-https images over SSL pages

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Add image proxy settings to Settings.php

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Missing newline at the end

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Some code cleanup for proxy.php

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Auto-transform non-HTTPS images into proxy link

Signed-off-by: Shitiz Garg <mail@dragooon.net>
Redirect to https equivalent instantly if we're forcing SSL

Signed-off-by: Shitiz Garg <mail@dragooon.net>