Merge CM

Proper working Camera app