Wp7

Merge WP7 branch to master