#1156
#1153
#1153
#1156
#1156
fixing nosetests addresses #1157
#1162 changing annotation (decorator) order
#1135 - add bootstrap 3.2
#1163 making sure that the transformation to relative url only happens
when the resource needs to be transformed
#1164 making recaptch independent of protocol
Merge pull request #1165 from OCHA-DAP/ssl-changes

Pull request: Ssl changes
Merge pull request #1166 from OCHA-DAP/dev

Pull request for:pushing SSL changes to staging
#1167 Fixing problem with tests outside of hdx_theme

- the problem was that tests outside of hdx_theme still inherit from
HdxBaseTest which is in the hdx_theme. So this tests need to override
the _load_plugins() class method in order to specify their own plugin
#1135 - new bootstrap location
#1135 - refactor the google analytics out of the main template
           - moved the Bootstrap specific hacks for the 1070px + 90px content width hacks
#1135 - created a lite version of main.css in order to exclude Bootstrap 2.3 styles from it
#1135 - Bootstrap 3.2 fanstatic resource bundle
Merge pull request #1169 from OCHA-DAP/dev-refactoring-arti

Dev refactoring arti
cleaning up old files, closes #1157
merging dev-refactoring