swamed blm fix
update swamed
ip
update
master
metallica
update
metallica
asd
Merge branch 'master' of https://github.com/arvinnizar/sukses-apotek into with-shift

Conflicts:
	config/database.php
	models/autocomplete.php
	pages/penjualan-list-resep.php
	plugins/metro-jquery/styles.css