caliburn micro wp7 app
pull conflict solved
Merge branch 'master' of https://github.com/bujdeabogdan/WP7CaliburnMicro

Conflicts:
	.gitignore