MUMMNG-409
Merge branch 'master' of github.com:UW-Madison-DoIT/uPortal

Conflicts:
	pom.xml
UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
Merge pull request #172 from shawnconnolly/UP-3825-UPDATE

UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
UP-3825: Updating to fix buttons from overlapping at the iPhone width in Respondr
UP-3799 - Upgraded weather portlet version
NOJIRA : Fix issue with master branch on local. Merge remote-tracking branch 'origin/master'