Merge pull request #222 from BuracayBeach/team1/dev

Team1/dev
Updated mah files!
Merge pull request #223 from BuracayBeach/Team_5_Version_2.0

Updated mah files!
Removed foundation links
Edited pagination panel, added 'other' for material type filter, fixed type dropdown
Merge pull request #224 from BuracayBeach/team4_v2.6.2

Edited pagination panel, added 'other' for material type filter, fixed t...
changed search by caption, provided sort by for users, prevented rapid ajax attack for search, optimized pagination, secured results per page input
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team4_v2.6.2
Merge pull request #225 from BuracayBeach/team4_v2.6.2

Team4 v2.6.2
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team_UI
Robust DOM structure and Navbar CSS
Merge pull request #226 from BuracayBeach/team_UI

Team ui
Updated Login with notifs and redirect to another another login if login attempt went bad
Merge with new layout
Merge pull request #227 from BuracayBeach/Team_5_Version_2.0

Yown, nag-merge!
adapted special characters for searches, bolded matching terms
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into team4_v2.6.2
Merge pull request #228 from BuracayBeach/team4_v2.6.2

Team4 v2.6.2
Added redirection for pending and deactivated accounts
Merge branch 'master' of https://github.com/BuracayBeach/myfirstrepo into Team_5_Version_2.0