Merge branch 'dev' of https://github.com/projectfork/Projectfork into dev
Merge branch 'dev' of https://github.com/projectfork/Projectfork into dev
- splitting admin dashboard into Joomla 3.x and 2.5.x versions because layouts were fighting. Fixes #189

Signed-off-by: kyleledbetter <kyle@kyleledbetter.com>
Merge branch 'dev' of https://github.com/projectfork/Projectfork into dev
Merge branch 'dev' of https://github.com/projectfork/Projectfork into dev
- removing btn-group from pagination and filters, moving some filters into the search collapse, optimizing Bootstrap markup. Fixes #209 and Fixes #220