added new weapons_advance.gif and updated leadership.html.erb


Former-commit-id: 8faf2d799263c67c90cf9655401368c0df54f4ad
edited Man-nerisms


Former-commit-id: 75e171c6bad1f3815cbb28822a2586952b41492a
merged asset_pipeline with master


Former-commit-id: ca23c1853ccde10de79913c01f587d14476a0dda
updated capistrano deploy.rb file to point to master


Former-commit-id: a3b8a5b8d5dbae60a26ed66c13b7e6ed40bfcf07
fixed desktop.css issues. converted desktop.css to desktop.css.erb to evaluate asset_path for background images


Former-commit-id: be82049430f57a1543fe6024e65122bdf659b9db
fixing jQuery issue with MDN news ticker


Former-commit-id: 90cb00ac2d59a6e60367e280c85eead71c9a9af2
fixing jQuery issue with MDN news ticker


Former-commit-id: 827cbf3a2b59fdbee7c0a15a345af49fad170fe1
trying to fix ticker


Former-commit-id: 4e540d76c0698f3ae1ab132a38b48d3a915e4409
changed news ticker over to jquery plugin for scrolling ticker: http://aamirafridi.com/jquery/jquery-marquee-plugin


Former-commit-id: 93c6380d0b578500b96f097d90c6b83522538fb3
updated environments/production.rb to properly point config.action_mailer.default_url_options to the correct host


Former-commit-id: b030b2039f3e35b58951b0f34cbdae120df8e7e8
added pauseOnHover to scrolling marquee


Former-commit-id: ead60eb080193e4e8a298cc7c47d9691ce8858c2
fixed div layout preventing movies links from working in movies/browser.html.erb


Former-commit-id: 215b41fed71815099a1ddc767ed07782bf15e035
fixed formatting issues manifested in Chrome, Firefox, and Internet Explorer for the home page index.html.erb


Former-commit-id: a2016532d815f6abd26ba0df42658e7ad93833d0
modified css to fix colors and layout


Former-commit-id: f7d2e3e5f432868815404779e9a832a88588c710
changed contactus top image and fixed issue with streams deletion not working


Former-commit-id: bf3f4f3386845f9fb57c818711e184c8ba296bda
increased number of records displayed for users controller index.html.erb


Former-commit-id: ded33b96498c218104f48c5cc779fc910f9ba46d
changed pages/curriculum.erb.html


Former-commit-id: 11dcbb1a643403613db1acc257e2925a7212c3b3
tweaked CSS for curriculum and manstats pages


Former-commit-id: 08d875e0dd82685e7f593e36ed8ed4055df7266f
tweaked CSS for curriculum and manstats pages


Former-commit-id: 0cc0fe60cd71179f6761859c6361b31a03fa3c43
changed order of content on curriculum.html.erb page


Former-commit-id: c0d343898d7bdd14d20dfbdcbfce7c1ed5a8cb93