aafsfsa
Merge branch 'master' into dem

Conflicts:
	lib/uimap/base_page.rb