added flatapp theme
changes merged
merged again
Flatapp added