r2

Signed-off-by: Nguyen Thanh Binh <binh.drca@gmail.com>
Merge branch 'dev' of https://github.com/misafamily/m68sc into dev

Conflicts:
	MyApp/www/app/view/Main.js
	MyApp/www/app/view/home/HomeChart.js
	MyApp/www/app/view/record/Record.js
	MyApp/www/app/view/record/RecordItem.js
	MyApp/www/resources/css/app.css