Fix merge problem
Merge branch '6.1.5'
Enhanced permission checking on views and snippets

Thanks to Richard Turnbull from NGS Secure Research who discovered a
minor issue that made it possible for authenticated Umbraco Users to
view files beyond their permissions
Fix multiple words in search U4-2509

When multiple words are entered in the search field no results are
returned.
This pull req. contains the fix suggested by Tony.
Improved admin search splitting query U4-2509
Improved search with "and", partial match U4-2509

- added partial matching on each word.
- fixed bug so 'all' words match rather than 'any' words.
Merge pull request #135 from Myster/master

Fix multiple words in search U4-2509
Merge branch '6.1.6'
Fixed issue where member type properties would not persist after first save without reloading page
Merge pull request #147 from AndyButland/u4-2958

Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
Merge remote-tracking branch 'umbraco/master' into 7.0.0