test for branch
modified my_model.php
deleted my_model.php
add a blank for test
finish line chart with single line
finish all the line chart with single line
complete the library of multi series type line chart
Updated the develop plan
add bar chart in init_quality
finish draw target and change the excelhandler
Merge remote-tracking branch 'origin/graph' into graph
highcharts global config
highcharts global config
add saiku.cookie to .gitignore and handle some conflicts
add saiku.cookie to .gitignore and handle some conflicts
finish target model with y-m-d in x-ray
Merge remote-tracking branch 'origin/graph' into graph

Conflicts:
	application/views/templates/sidebar.php
	public/third-party/saiku/saiku.cookie
add the user target model and finish analyze the week json data
modified the .gitignore file to ignore upload and captcha
modified the .gitignore file to ignore upload and captcha again, after conflicts