* Windows faping;
* Photos added;
* Merge;
* Merged with master;
* Winfixes;
Merge branch 'master' into master-en
*fixes