Merge pull request #1 from EddyVerbruggen/master

Sever tweaks
Version bump
Add license to plugin.xml
Add conditionals to support iOS 6
version bump
Merge remote-tracking branch 'upstream/master'

Conflicts:
	plugin.xml