24/10/13 4:15AM

Merge master into A1
25/10/13 5:22PM

nevigation buttons 
and external db functionality added
29/10/13 8:33AM

Merge A1 into master