Merge pull request #1211 from njam/issue-1211

Send viewport size as custom variable to Revive
Merge branch 'master' of github.com:cargomedia/CM into issue-900

Conflicts:
	library/CM/Model/Location.php
	library/CM/Paging/Location/Suggestions.php
	resources/db/update/26.php
	tests/library/CM/Paging/Location/SuggestionsTest.php
Fixed city model schema

- _maxmind is an integer for cities, not a string like for states.
Remove possibility to pass component as instance as name param
move templates to the view
include template css class on formfields
allow templates for Boolean formfield
minor form styles
minor form styles
add switch template to Boolean formfield
include "Boolean Switch" in example cmp
add blank FormField Boolean test
css class prefixing for FormField also
add BooleanTest
make font-size relative
minor formatting
Used CM_File to read GeoIP data
Dump node tree instead of using registerViewResponse()
Used db locks instead of pid files

- Added table for locks
- Refactored locking mechanism in CM_Cli_Command
- Added local maintenance job to monitor locked processes
Formatting