Merge pull request #79 from JetAlone/develop

Master
Merge pull request #81 from JetAlone/develop

Master
Merge pull request #83 from JetAlone/develop

Master
Merge pull request #85 from JetAlone/develop

Master
Update .gitignore and config.ini

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update config.ini

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update .gitignore
Update index.php

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update view.php

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update index.php

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Update index.php

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Clear cache

Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Merge branch 'develop'

Conflicts:
	.gitignore
	php/.gitignore


Signed-off-by: Marcin Pyrka <pyrka.marcin@gmail.com>
Merge pull request #92 from JetAlone/develop

Master
Update .gitignore
Merge pull request #94 from JetAlone/develop-qm

Merge pull request #93 from JetAlone/develop
Merge pull request #95 from JetAlone/develop

Master
Merge pull request #96 from JetAlone/develop-qm

Develop qm
Delete .gitignote
Merge branch 'develop-qm' into develop