fixed a bug and removed some extra markup
removed old templates and accounted for inline plugin editing
Merge remote-tracking branch 'upstream/master'
Django 1.6 compatibility; version bump to 1.6.0
Django 1.6 compatibility; version bump to 1.6.0
FIX #56: jquery now loaded from local installation, not the CDN
FIX #65: recent actions now has working urls
version bump
Merged  ze-phyr-us-bs3 branch. Squashed commit of the following:

commit 79fe57f8db690cc594be8b78dc41250db83aadbd
Author: Riccardo Forina <riccardo.forina@lumatagroup.com>
Date:   Thu Nov 28 11:28:20 2013 +0100

    Removed python code duplication, the new bootstrap3 app requires the use of the main app.
    Fixed the search box in the navbar.

commit d37d69b9f03d49e8af0f1cd163bc5eaea8753eaf
Author: Riccardo Forina <riccardo.forina@lumatagroup.com>
Date:   Thu Nov 28 11:14:50 2013 +0100

    Updated test app

commit f395375a753b949347aeed7667bfe439aa3e0663
Author: Vita Smid <me@ze.phyr.us>
Date:   Sat Nov 23 16:17:24 2013 +0800

    Fixed navbar collapse

commit 6bd66295419540082fbdf28eb3bc5910b0724562
Author: Vita Smid <me@ze.phyr.us>
Date:   Sat Nov 23 16:08:31 2013 +0800

    Restored the Bootstrap 2 app from d4f05c7dae6affe91fe279a8a9e12c5149e6d198

commit 2f4dddb3e4f5fd3efd8ee4f56f4152fb3591c759
Author: Vita Smid <me@ze.phyr.us>
Date:   Sat Nov 23 16:03:34 2013 +0800

    Moved the whole Bootstrap 3 app into a bootstrap3 subapplication.

commit 5d03664111970e6256cc354b57331ff11eee0df1
Author: Vita Smid <me@ze.phyr.us>
Date:   Wed Nov 20 10:10:25 2013 +0800

    Updated class names in JS & CSS

commit 918f70bf891c7ab710e0e232b589638aa355084b
Author: Vita Smid <me@ze.phyr.us>
Date:   Wed Nov 20 10:04:05 2013 +0800

    Password reset -> BS3

commit 2a72aa4bff4477073ccb9468cc3ec5d18c38192b
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:49:47 2013 +0800

    pagination -> BS3

commit 12dc6bbea9278f54e018270953e2ea622c8123d8
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:48:09 2013 +0800

    Password change -> BS3

commit 2c7a7e2b6fe61f03822c25e3158234de120e9fbd
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:45:03 2013 +0800

    Login & logout forms

commit 723232d8894349374b9bc299b166c6b3cd452702
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:33:52 2013 +0800

    Bits and pieces -> BS3

commit 5dd08b5c3d0be5ff54ac7b080b80059d142587f9
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:32:14 2013 +0800

    Delete confirmations -> BS3

commit d719a6706652f583c67d9b4130ec333e2a51c3a5
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:29:17 2013 +0800

    change_form -> BS3

commit 804a4629c7a5d984102d1d8d515b655964e7a323
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:23:05 2013 +0800

    change_form -> BS3

commit d85b0e6522621fe286cd7e6621d1f97bc84ae0f0
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 16:04:59 2013 +0800

    change_list -> BS3

commit 3ce646d7a08d660991577f1c0ee44261edf2232a
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 15:58:29 2013 +0800

    Fixed object tools navbar

commit 61dad2af040c40e363e41af006961bf2234e7fcf
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 15:51:03 2013 +0800

    app_index -> BS3

commit b626ca35b9898b4ec31d872b63ba40ee831d5f6d
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 15:47:59 2013 +0800

    base.html and admin index converted to BS3

commit 82435a26b19cfbeae3c63047f98ecfbeb3684208
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 15:26:05 2013 +0800

    Removed the <link> to bootstrap-responsive and added bootstrap-theme instead.

commit d24abb2f9a0dd22641c1b6894d657c7413033724
Author: Vita Smid <me@ze.phyr.us>
Date:   Tue Nov 19 15:23:52 2013 +0800

    Replaced BS2 with BS3 files
Update README.md

Added instruction to enable the Bootstrap 3 theme.
Update README.md

Fixed `boostrapped` typo.
Fixing actions_on_top Go button not working
Merge pull request #70 from tejinderss/master

Fixing actions_on_top Go button not working
Wrapped the delete confirmation text in a div styled as an alert-danger
updated path to app tempaltes

I believe there needs to be a app folder under the templates directory, even if the template directory is under the app.
Merge pull request #71 from speg/patch-1

Error in README: updated instruction refering to where to place templates when embedding them in an app
fix fieldset display for bootstrap 3
allow more width for labels to prevent wrapping
attempt a grid layout using a custom filter to figure out how many columns per row
Merge remote-tracking branch 'origin/master'
Merge pull request #73 from DjangoAdminHackers/master

Fix display of column groups on bootstrap3. Also uses bootstrap grid for layout of multiple fields per row
Update README.md

Added Pypi download statistics