Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Merge remote-tracking branch 'upstream/next'
Fixing android compiling path
Merge remote-tracking branch 'upstream/master'
Fixing resources paths(master)
Merge pull request #790 from Joilnen/master

Fixing resources paths (master)