Added content expand functionality
Added flash version and cleaned up code a bit
Merge branch 'testBranch'