Merge branch 'release/v1.0.5'
Merge branch 'release/v1.0.6'
v1.0.7 EE 2.6
v1.1.0
Merge branch 'release/v1.1.1'
Fix update function to alter version in database

This makes it match the EE developer guide (http://ellislab.com/expressionengine/user-guide/development/extensions.html#activating-and-updating)
It also makes the devot:ee monitor detect the version update.  Otherwise, the version is not changed in the database.  EE will read the version number out of the file, but devot:ee will not so this makes the DB match the file.
Merge pull request #35 from wiseloren/patch-1

Fix update function to alter version in database
Merge branch 'master' into develop

Conflicts:
	ext.entry_type.php