Squashed commit of the following:

commit 121a84cc12c81f8bf1e827bcfac400446018a19e
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Thu Apr 4 10:36:32 2013 +0300

    Adding initial content to data page
Merge branch 'develop'

Conflicts:
	data/index.md
Squashed commit of the following:

commit e58ec7ee8f7c2f54d373054af38457d08ded3700
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Thu Apr 4 14:11:52 2013 +0300

    Updating Data and API info

commit 4259cb7d532f59aa1beb092ef7cf1e72a8711b42
Author: Kenrick Turner <kenrickturner@gmail.com>
Date:   Thu Apr 4 11:10:43 2013 +0300

    Enabling Maruku and Blahtex for fancy formulas
Merge branch 'develop'
Squashed commit of the following:

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Updated files
Squashed commit of the following:

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Squashed commit of the following:

commit e681d040323c4fe7ad731ff857d3a9449c323d9f
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:50 2013 +0100

    dashboard not working

commit 01aee14207a63155ade5e3bbd4ac406cf88ec897
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:40 2013 +0100

    dashboard not working

commit 06da2e2a9faa323e1f8c686316be89990c723f41
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:06 2013 +0100

    new post

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
hiv dashboard updated
hiv dashboard updated
mch dashboard updated
Squashed commit of the following:

commit ac7073c042bd1dd06af7813039b656c0da6cb708
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:15 2013 +0100

    dashboard updated

commit c1ce83463379507b75983a3dc90aa45fb1cfe6cc
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:01 2013 +0100

    dashboard updated

commit 51fdebabd25443821ea506169b45cba7d097efb7
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:56:37 2013 +0100

    dashboard restored

commit e681d040323c4fe7ad731ff857d3a9449c323d9f
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:50 2013 +0100

    dashboard not working

commit 01aee14207a63155ade5e3bbd4ac406cf88ec897
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:40 2013 +0100

    dashboard not working

commit 06da2e2a9faa323e1f8c686316be89990c723f41
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:06 2013 +0100

    new post

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Squashed commit of the following:

commit 0fe653d9bd2d76e8bb68dbd061ee9abd328a4d61
Author: John Haskew <john.haskew@gmail.com>
Date:   Sat May 4 13:18:07 2013 +0100

    Updated Page

commit ac7073c042bd1dd06af7813039b656c0da6cb708
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:15 2013 +0100

    dashboard updated

commit c1ce83463379507b75983a3dc90aa45fb1cfe6cc
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:01 2013 +0100

    dashboard updated

commit 51fdebabd25443821ea506169b45cba7d097efb7
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:56:37 2013 +0100

    dashboard restored

commit e681d040323c4fe7ad731ff857d3a9449c323d9f
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:50 2013 +0100

    dashboard not working

commit 01aee14207a63155ade5e3bbd4ac406cf88ec897
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:40 2013 +0100

    dashboard not working

commit 06da2e2a9faa323e1f8c686316be89990c723f41
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:06 2013 +0100

    new post

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Squashed commit of the following:

commit a489317ddde1bda6677736cffd0eeda67e684d0b
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 11:44:11 2013 +0100

    Added reporting

commit c2dfe5d03bf2706499857a46ab60077b1c10e52d
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 11:28:27 2013 +0100

    Displaying percentage change from May 6th in mch dashboard

commit 0fe653d9bd2d76e8bb68dbd061ee9abd328a4d61
Author: John Haskew <john.haskew@gmail.com>
Date:   Sat May 4 13:18:07 2013 +0100

    Updated Page

commit ac7073c042bd1dd06af7813039b656c0da6cb708
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:15 2013 +0100

    dashboard updated

commit c1ce83463379507b75983a3dc90aa45fb1cfe6cc
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:01 2013 +0100

    dashboard updated

commit 51fdebabd25443821ea506169b45cba7d097efb7
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:56:37 2013 +0100

    dashboard restored

commit e681d040323c4fe7ad731ff857d3a9449c323d9f
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:50 2013 +0100

    dashboard not working

commit 01aee14207a63155ade5e3bbd4ac406cf88ec897
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:40 2013 +0100

    dashboard not working

commit 06da2e2a9faa323e1f8c686316be89990c723f41
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:06 2013 +0100

    new post

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Conflicts:
	assets/js/dashboard/dashboard-mch.js
Conflicts:
	assets/js/dashboard/dashboard-mch.js
Fixed menu
Squashed commit of the following:

commit 43a2c0ded994897b98f93a4cd5d9c599386f5d91
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon May 6 20:34:33 2013 +0100

    Introducing Reports

commit e2d7be5ac3b14d89a3214765d3b1465b6060f900
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 14:39:00 2013 +0100

    Fixed menu

commit 5e8a9fc3f35383a76765899071bd72abdfc6a080
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 12:47:48 2013 +0100

    MCH dashboard fix

commit fa468c6db93a60a12c4a8621e78827b21910c9f1
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 11:58:05 2013 +0100

    Small fixes to mch dashboard to display percentages

commit a489317ddde1bda6677736cffd0eeda67e684d0b
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 11:44:11 2013 +0100

    Added reporting

commit c2dfe5d03bf2706499857a46ab60077b1c10e52d
Author: gulfa <gunnarroe@gmail.com>
Date:   Mon May 6 11:28:27 2013 +0100

    Displaying percentage change from May 6th in mch dashboard

commit 0fe653d9bd2d76e8bb68dbd061ee9abd328a4d61
Author: John Haskew <john.haskew@gmail.com>
Date:   Sat May 4 13:18:07 2013 +0100

    Updated Page

commit ac7073c042bd1dd06af7813039b656c0da6cb708
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:15 2013 +0100

    dashboard updated

commit c1ce83463379507b75983a3dc90aa45fb1cfe6cc
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:57:01 2013 +0100

    dashboard updated

commit 51fdebabd25443821ea506169b45cba7d097efb7
Author: John Haskew <john.haskew@gmail.com>
Date:   Tue Apr 23 14:56:37 2013 +0100

    dashboard restored

commit e681d040323c4fe7ad731ff857d3a9449c323d9f
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:50 2013 +0100

    dashboard not working

commit 01aee14207a63155ade5e3bbd4ac406cf88ec897
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:40 2013 +0100

    dashboard not working

commit 06da2e2a9faa323e1f8c686316be89990c723f41
Author: John Haskew <john.haskew@gmail.com>
Date:   Sun Apr 21 16:29:06 2013 +0100

    new post

commit 7283e48a71808fa3c39fd8a7ed0fc530be391aba
Author: John Haskew <john.haskew@gmail.com>
Date:   Wed Apr 10 12:15:56 2013 +0300

    Updated files

commit 145307a1a85574333111a47c467326474e443a9e
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:47 2013 +0300

    updated files

commit 4cdd120e21d89d934636d99bf7b0974c630a6d5f
Author: John Haskew <john.haskew@gmail.com>
Date:   Mon Apr 8 11:39:01 2013 +0300

    updated files

commit 4005decfbc6fd46767799b316101695a557e8cd0
Author: gulfa <gunnarroe@gmail.com>
Date:   Fri Apr 5 17:04:48 2013 +0300

    Sort dates for timeline to avoid wierd graphs
Merge branch 'master' of github.com:uamuzibora/uamuzibora.org
updated files